Further test tidying