grid calculations use types_in_calc, finishing up tests