DAT-2115 Added a few more testcases to accomodate for subpages