Third commit. Add new tests on Calculator. 100 % working draft.