Restructure integration test set up