cleaning and more and better tests