adding retrieve response, fixing tests