reorganize tests to reflect refactoring