Changed TestRemoveDirectory to have a clearer separation between the directory add/remove events and the file deletion events.