EAGLESIX-3005: ListOfMatchExpression minor changes, reorder code, add unit tests