Optaa dev

code cleanup
modified driver and test_driver for unit tests, integration, and qualification testings