Add tests
Add struct test