updated as per issue 212
updated after the issue fix 204
Merge remote-tracking branch 'origin/newRegressionTests' into dev