Minor tests refactorings
Minor tests refactorings