Updated RelationalQueryBuilder/Tests