Moving tests into test_project