more model work, moved test