Autonomous, and other testing related fixes