Fixed test asserts
Fixed xofts issues