Add user struct
Add tests for structs