Added QueryBuilder unit-tests