migrating optiml tests into forge; fixing bugs that caused test failures
OptiML tests missing from previous commit
Merge branch 'master' into cgen