more upgraded models and more tests