remove unnecessary tests, and refactored one test