Restructure integration tests