Fix QueryToolControllerTests