Updating tests to align with consolidation of helpers files