Added more tests
Added pagination