more model testing

merging into masta