Fix up some test related things