Integration of the new layout for test pages