more tests, now fails nicely if not complete query