Add back a test that was removed in r188450