Fix tests ... hopefully.