Modified test suite