Add unit test + clean