Updated unit tests refactored deploy