CONTRIB-4151 First cut of CS testcase. TOAMEND!