Minor test refactor and adding keep alive tests