can't be sure models will have names in tests
merge master