recalculation test cases and some corrections
Merge pull request #1080 from pramodn02/develop

recalculation test cases and some corrections