More cs/test fix