make tests work with new optimizer interface