Wrapping response and adding tests.