Fixing response parser and adding unit test for it