fix unit test for single page arch, remove some old stuff