Updated Tests
Updated Pagination class