parse response only when needed
fixing the tests