Adjusted test suite