Re-added WpfExtensions and tests
Fixed up compiler warning on test helper code