Fixed paths in testSuite
Improved option parsing via command line.