Added eTag and fixed odata server tests