Adjusting asserts for new functionality