Added support for -XViewPatterns
Renamed files.
Uncommented Code in test files.