Fix typo
Refactoring tests