r22415: Remove test directory once we are finished. Merge -r 22393:22394