Yes I was thinking of having separate integration test cases, and removing all the complex mock based tests.