Fix tests ... hopefully