test fixes, controller update