Added tests for calculator