Fix Character model and tests