modularising integration tests