Fixed WPF Test App