Comment 3 for bug 2051585

Incomplete patch. I tried to keep the code changes small, so I used a custom class to patch the deprecated test methods. It revealed further sections of deprecated code usage, but it may or may not be breaking the custom unittest class loading (see the assert_ patch). At this point I found the delay between build time and test failure to be prohibitive.