Updates to tests to support new method names