Merge pull request #2202 from lukecampbell/fixes

Removes deprecated tests
Fixes broken DM test