add build-queries to test. minor cosmetic code-changes