1. Updated minor tweaking for WPF test program