Update all the comments and fix up the test case