Contact deletion and more test improvements.