Merge "Correct TripleDes tests." into pi-dev