Make some tests pass
Make most of tests pass. The rest may be toot's bug.
Failed tests are here <https://gist.github.com/KeenS/6898642>
remove unused argument variable