Restructured model tests