More assigning supporting pages correctly in tests.