Make some changes in test WPF app. Still have some bug related to unfiring of event in ServicesMapper