fix controllers and tests