Adding test for first page
Fixing merge conflict