Fixing broken test matches...