Use new tools to improve tests