WIP -- Bug 916035 - Follow up bug for writing test on bug 913377