Conformance Tests for Spec Change in PR#624

Adds/moves around tests for #624