improve query builder and connection manager, skip coverage of some soon-to-be-removed methods