refactor - move builders into Query classes and combine tests