Fixed changing adress bug & marker romoving bug
preparing tests