Update setValue and addValue to allow number

  - update code
  - udpate test