Changes to test suite