Added more unit tests to the calculator