Fixed ExpressionExtension so that it can better handle type changes.
Added new TestDataCollection generic class.