Added structure for integration tests