do not include inputs that have calculation in or-calculated-items (don’t include them twice), fix tests