Working on Calculator and Test calculator