Add clean task and missing tests