some tests to changes stuff related to #332
use ref to doc descriptions in model when possible for #332