Updating controllers and tests