Enabled cleanup code
Changed test dir prefix