Fix plan start bug
Fix broken tests