cleaning, more tests