Various changes to bot and test
Fixed merge conflicts