fix test
more fixes against matcher