Added defstruct changes to megatest.scm