add test & recalculate fix