Tests updated after integration with optimization subsystem
Fixes after integration tests