Test cleanup and fix empty filename