Added get methods to retrieve values. Updated tests