Unit tests refactoring, they are now working properly