imporvment of tests and document methods

Change-Id: I97d70e3600375377bdb5d358ab2db9faafe92f5e