Fix up test suite for new page changes