Moderate/SimpleCalculator minor cleanup and added official test file