* fix tests.
* rename scope.
Merge branch 'master' of https://github.com/guhilling/cdi-test
Merge pull request #1 from muestefa/master

merge test setup changes