Whoops.  Fix tests