Fix some API changes that I missed.
Make 3D secure test more reliable.