Added models tests and some fixes