Added Calculator, First Test