Reorganized tests/ to mirror the structure of models/.