fix issue with pagination wrapper
tests updates