Order in models tests. Minor changes in several other files.