Remove two test cases.
Add some comments in the test cases
Last refactoring before submiting