Phase out deprecated tests
Merge pull request #1754 from jamie-cyber1/rm_oldtest2

Phase out deprecated tests