Adds tests for opti
Adds more tests for opti