Reviewer Suggestion: Simplify and refactor add-keeptime merge request

@jayo this is a proposed changeset to simplify the tests.

I'm sure it can be simplified further, but this is what I could manage in a short span.