TestPageService fixup