Added keepAlive logic + number of integration tests