Fix tests harder