Break 07 into subtests to prevent scope contamination causing bugs
Fix broken equiv test