Rename bot testing
Add testing and fix some bugs