recalculation test cases and some corrections