Removes more references to page.show. Also removes a duplicate test. Change-Id: Ib045b8f5ad1751f2cf399460d703e367f24d3811