Added Calculator test + fixed