ISPN-4464 Unify test suite for remote and embedded DSL based query tests

* Fixed test so it will properly close cache manager and continue build