Last corrections
Remove noise from tests