Organize queries tests