added more test and refactored one test