Fix Calc some more, add another test