TEST-9 improvements due to liam's comments