some cleaning and tests