Add Add and Get methods and tests