Adding integration tests back