Improved robustness of file creation routine.
Updated step definitions after master branch merge.