added TODOs
more Matcher tests