Bug 1032166 Follow up to bug 959201 with tests