CS fixes in tests.