refactor tests
more test refactoring