Fix ContactResource and EtagTest