Fix scoping
https://github.com/BrynCooke/cdi-unit/issues/36