Updated to match submitted draft. More test vectors run.