Added WPF test counterpart
Adding left out files