more tests added -- for removal and fixed