Fix tests so they actually pass

Such a shame when people update code and not fix the tests - this does
that.