refactored some tests.