Mocha tests for s.Bot class

Include code refactor and minor fixes on the class to make easier testing