Decrease dependencies in some tests

Change-Id: Ib426df1290ccf0b5e145b70e24ba3be99bf1b102
Set main NS to have subpages in test run

Change-Id: Ib6f98b0202cdd9808a20d8c722f881cd239a243f
Merge "Decrease dependencies in some tests"
Merge "Set main NS to have subpages in test run"