Remove flaky tests
Adding TestData
Adding a failing file replacement test - references issue #140
Fixing the file replacement test - fixes issue #140
Merge branch 'master' into develop