Unit tests refactored
Unit tests refactored