Fixed tests to work with nested layout values.