Adjust test suite