Updated PortfolioService

Removed the conflicted service calls in PortfolioService  and added Unit testcases