Crm 14521 test fixes & tidy up (limited to test suite)