Updates to abstract.class.datastore.paged.L3-2 classes and unit tests