Updated tests for newer calls.