Added Windows 8.1 Support and two test cases for Windows 8 and Windows 8.1