Update gems
Update tests to match structs