Add animation
Add test base for pagination case