Expand triggering tests.
Correctly delete moved files.
Merge pull request #775 from arjclark/expand-battery-9

Expand battery 9