I refactored the way unit tests / integration tests are written. Now we have common functionality grouped into two base classe.