Fix remaining nvc tests