Switched test 6 to use the new Layout type.