Added OPT tests