refactored assertion
more refactoring of tests
more refactoring of tests