Tidy up some test names and remove pointless comments.