Sorted out remaining refactor of specs around "bot".