adapt kill test on changes in control class