Switched test 4, 7 and 9 to use the new Layout type.