Added tests, Fixed adding problem