Removed unneeded injection code
Refactor CART - added more tests
Continue merge...~