minor test tidy ups