better test case
get rid of extra calls to dao.query()
add cursor to decorator
query utils cleanup