fix test, reuse utility methods that were already refactored