Minor test tidy-ups