fix: some tests and add kaminari