refactor for generic future test utilities