Fix broken tests for Page properties

Change-Id: I2ac7f3e3c6912cbf4e89f90289755a473b09bf44
Merge "Fix broken tests for Page properties"