Remove modifed respond_to
Add some more tests, fix some bugs