Added test, fixed error in addition