Rework of models. Skeleton test.