Add test matrix from RFC-6238 with updates from erratta