Fix potential tests' failures