Reduces mocking down to actual response to improve coverage, changes tests accordingly.