added failing tests - issue caught by @jrridout
fixed typo
fixed bug in formatting of mapping file
improving naming of output files