Further tidying of tests