Deletion file while removeint key fixed. All TODO's done. Some tests added.