STY: More consistent test skipping
WIP: Moving toward improving match