Reordered the test for easier testing. Updated some comments.