Cleanups and better testing in Frameworks/Service stuff (on windoze)