Add tests from C.5 and C.6 too.

This should cover all tests from the spec.