Updating unit tests for calculator....