My refactoring branch

Put all test into one test file