Fixed a crash that could occur.
Refactored the tests again to make them stop fighting eachother