Finalize cleaning and first tests