bring struct test into new regime