Improvements in models tests