add calculator and junit tests