fix tests & paginator