Fixing unit tests and finishing refactor of rating and date