Further cleaning tests