Refactor integration test system part 1 of X