Expand triggering tests.
Correctly delete moved files.
Better error message for unqualified family triggers.
Merge pull request #775 from arjclark/expand-battery-9

Expand battery 9
Merge pull request #776 from hjoliver/fam-trigger-val-message

Better error message for unqualified family triggers.
Tweak queues reload test.
Merge remote branch 'upstream/master' into minor-tests-refine