Added more Calculator plugin tests