Fix tests for 5.3 and cs