added if else matcher and some more specs/improvements to class matcher