BK-1029 Correct tests for frontpage
Merge branch 'BK1029' into 2.0