Merge pull request #1910 from edwardhunter/mission

Import error and typo.
Move test to correct location.