debugging cleaning
readding tests