refactoring,organizing tests.