Fix broken tests (which were caused by use of obsolete Enum)