Add some more test and delete unnecessary code
Add some more test and delete unnecessary code