Make AA always require Mustard Automation with Mustard Tools

Quick fix to test order, resolves #871
Merge pull request #878 from JadeE1024/jade2

Make AA always require Mustard Automation with Mustard Tools