Add unit tests for calculator #2