Added Fields to Investor + Updated Test