Correct comments and test descriptions