Adjust tests for Utils refactor