Start implementing bot, test helpers reorganization