Add utility class to extract some functionality from test