Updated expected values and comparisons, added bonnie rake tasks for reset expected values, cleaned up comparison calculation code