Fix test case breaking after changes

> We should push directories to the list of files, too, so always push
> $file unconditionally

> We now print "dir" instead of "dir/" if a dir is untracked, modify
> test case respectively.