Fix dynamic control test
Fix all remaining tests