Added test for DataTemplate without x:Key or TargetType.  Fixing rest of tests.