Add unit tests for core/stores/util/simpleQueryEngine.
Adjustments to configuration.
Reorganise unit tests.