updated classes and tests due to refactoring by leif, test query ranker now working again