Update tests to latest upstream