Updated model tests