WIP - Query builder unit tests'