Fix new enum scoping rules
Fix test imports too
Merge pull request #22 from andor44/master

Fix new enum scoping rules