Add further tests for nested structures