Added tests and remove