Merge "Point test mappings to new suites." into main