Fix tests for matches table and match_spec