Make AA always require Mustard Automation with Mustard Tools

Quick fix to test order, resolves #871