Updated Unit Tests as well as additional corresponding fixes in InputParsing and Pricing