Updates classes and unit tests post-pagination updates