Fixes to the ais testing stuff