EAGLESIX-2653 updated test cases for InMatchExpression and fixed more bugs