Fixed some struct xfer warnings & updated mux test to structs