Fix typo and improve tests isolation.