Phase out deprecated tests
Merge pull request #1755 from jamie-cyber1/rm_oldtest

Phase out deprecated tests