Switch marshaling tests over to pytest