Merge "Move a test I wrote under our wing."