Minor changes to test pages and mapper