add Calculator for test purposes