Added test bots and statistics.
Resolved conflicts