Improved query testing

[Bensk1]

A test should verify that the benchmark queries are correct. This could maybe achieved by checking if results are returned or comparing to a fixed validation result set.