Added add/sub functions with tests