Print correct output filename
More tests