And make the opt test work.