* Commit some fixes

* Accept expected
Co-authored-by: Igor Gov <iggvrv@gmail.com>