Fix add/minus operators bugs and add tests