Added new test methods to MarketData tests, changed MarketData slightly