Cleaning some tests