Ported tests 1, 3 and 4 to the new layout type.