Merge pull request #3622 from clumens/t865-prep
Reorganize and add unit test skeleton to prep for fixing T865