Move ContactClient spec into correct folder scope