Fixed failing pagination tests