Changed layout of main test shapes