Small test tidy ups