Fixed tests to reflect the new page model