Bug 17900: Update the tests to the new API