CHG: more testing for replacing controllers - better control