Added more tests for Calculator plugin. Hurray!