Add enum imports
Fix enum scopes in tests