fix first pagination + more test implementation