Fixed model tests and passed them