All tests passing, none pending

Standardize the order of enum value lists