Fix some model tests