Refactorization
Testing for pagination
Missing exception