Improved test bot