TEST-9 improvements due to liam comments