Adding back modified test for #939