Redo tests
Move test project to folder of same name