Unit test refactoring

Refactored unit tests to fix issues due to windows dependecies removal
along with httpservice refactoring and re-added EC2Service tests