Add: a few minor improvements/fixings for enum types;
Add: tests for invariables.