Renamed client to contacts. Added unit tests