Revert "Attempt at splitting tests"

This reverts commit 5998ebe52f1ee2cae21e2f0f983c3b7daccc6add.
Revert "Use cities1000 in test_project"

This reverts commit be0f2ff0b0e076b08f414c97d297fca475fb1d9a.