fixed pagination again
fixed tests