edited test suites to reflect aggressive refactoring