Fixed test failures as result of adding asserts