Merge pull request #46 from myrle-krantz/develop

Made portfolio more testable and corrected error found in integration test.