add test for And
Merge branch 'wangchangli' of github.com:XingCloud/incubator-drill into wangchangli