[BUGFIX] Fix feature tests
[BUGFIX] Change the way shortcut pages are handled