Thrown with the wind

Refactored the project tests into a single test.