Added child matchers and more tests