Reorganized model tests