Adds some features for botio AVM2 testing