Fix models and tests