Added type matching tests