Refactored some tests, passed, now building HorizonBot runner.