Refactor util tests with tabular facts