Minor contact datafield improvements and extra test