Update pagination
Fix format strings in tests