Moved the Query Builder into the Test Builder