Adds CleanPlan builder, and improve the testing infra.