Tests moved to another directory
Refactoring