Opt Test Update

version completed, but not tested due to compilation project problems on
windows.