chore(engine): generalize query parameter not null  helper methods

If the parameter only is checked against null we can generalize the
method to accept all Objects.
refactor(test): remove redundant initialization of variables map

The variables map is initialized twice. So both statements can
be merged.

related to #CAM-1773