Add DeleteQuery and DeleteQueryTest
function rename