Improvements to test refs #1742

Signed-off-by: Daira Hopwood <david-sarah@jacaranda.org>