Refactored rawstruct test