restored old enumeration name and values
fixed tests
Merge branch 'bug_644' into develop
fixes #644