Add macro option to override enum type
Fix tests