I think this was good the way it was. most of our unit tests are actually integration tests.