Change import order so test classes are first, OT expanded (minor adjsutment).
Merge pull request #1908 from edwardhunter/import_rebase

STCDEV M101 in progress.