Calculator class and tests added