Remove test project. Merge test into main project