Elvis tests refactorings