More network cleaning and new tests