Removing old test project and integrating into main