Another rename of the model template (in bundels); Test fixture