Simplified addFile and removeFile methods in test.