better naming maybe
refined the Query class
updated test_util.py
added docs