Adjust tests for utils refactor