Merge "Fixed broken EnumTest"