re-add EnumTest additions