Almost done with expression matcher, need to cover with more tests