Added/improved the KeepAlive tests.