Add some more title logic for Windows flavors. Test should now pass on XP, 7, 8, Server2008, Server2012.