Cleanup of conformance for short test vector usage