Cleaning and update tests.