Fixed rollback feature
Added stop and fixed some bugs
Removed test folder
Removed test folder