editing tests to ensure the work with new layout.