fix broken tests in unified-builtins2