Replacing deprecated methods

Hi @wmeissner I'm not sure if you have been planning it. I just replaced the deprecated methods into the unit tests.