Struct test updates