Refactor enums package + tests