added test for page navigation
Merge branch 'olegsbranch' into develop