Added JUnit tests for EntityQueryService