Tidy up "personal" testing in line with RFCs 2369, 2929, 3834.