abstracted a few packages and added test body for the calculator operations