Typo
Tests refactoring