Some cleanup tests added