CS fixes on the test suite