test_calc improvement