Added RankingOptions + updated tests