Simplified ProgramFilesX86 inquiry and also changed property inquiry to be named based.
Simplified test cases.
2.0.1 beta 3.