Updating tests, adding response