Use named constants for choices
Add basic unit tests