Remove all deprecated code from unit tests. Can be merged post 1.4 release.