Adding test for cleanning, Fixing bugs, still in progress