- add enumerationWithText: shortcut
- update unit tests