Fixed test pages after merge