Made suggested changes to test suite - fully expecting this will break something