test refactoring, used new assertions