Update the comment style
Clean up the rest of the tests