make util tests pass