Fix control plan tabs so they show running and stopped correctly
Fix test programs