Updates to abstract.class.datastore.paged.L2 class and unit tests plus minor update to L3 class