Test to verify page weight considers redirects.

Also some cleanup.

Change-Id: Ie2b3e93a703c1f120c54c7fbdcc7e6222c77d147