Some more test tidy up.