Fix enumerators in TestVsUtils