refactor test fixtures to be cleaner. add extra assertions