add paginator + some tests