Refactor tests with matcher for properties.