Update tests for latest upstream API