restructured rescore classes and added setRescore to both Query and Search and the accompanying tests