Added test
Refactoring
Renamed folder of unit tests