Fixes followed optimization tests