Fixed test suite so all tests are now passing