Added versions to model and tests