Move unit test file into seperate folder