Cleanup and added a test project