Added new unit tests to Calculator