Fix issue #15. Also change the way mocking response so we can detect
more bugs like #15. And borken cases are fixed.