updated tests to work with new cstruct