start refactoring tests to make them simpler and more consistent