Update controllers and tests