Improved kaminari support
Added more tests for Kaminari