Added model tests as well as new model