Fix project file for test target
Project file clean up
Clean up tests