Refactoring the tests.

_addFile() has been replaces by _addFiles() which takes a list of file names.