finish moving to rating package, fixing unittest