Add additional conditional test for spec generation.
WIP: Overhaul of frame matching.