Update interface and model tests