Switch tests to use Unmarshal.