Add Query#split_query and write test for #new method