undo fee_calc memoization, added guard for office, fix tests