Bug 1032166 Follow up to bug 959201 with tests

I think it's fine without verifying the callOrder because nothing could actually break the calling sequence here.