add more test and fix a wrong test, also comment some not-used-at-all codes.
If need some of thease code back, create a test case for them.