Adjusting asserts as well