Add attribute matcher
Add more spec
Fix specs
Merge branch 'add_attr_matcher' into merge_forks