* Fix issue-1048 * Take possible where-clause into account * Move test to existing test set * Fix wrong variable name