Added Unit Testing

Unit tests for functions
Merge branch 'master' into Ishin
Added Portfolio E2E Test

More E2E testing stuff
Merge branch 'Ishin'