Add outputfile naming
Stupid hack to make tests works