Reworked the tests just a bit