Created HealthCheckIntegrationTest, misc refactorings to other test