CS fixes in tests