mirged changes
tests added