Set some settings right and added an EntityTest class

Added Mockito to test dependencies to be able to test using Mocks (also needed it for EntityTest).
The test class is not yet finished, more tests need to be added.
Merge branch 'master' of https://github.com/ZimonD/ContextCG7