Added type matcher to type system
fixed existing typsystem test
Added type matching tests