Moved more of integration test into healthcheck