Remove old tests, start project tests
Clean up remaining specs