Renamed test files as a) the good file can be the same for all tests and b) the bad file can be re-used for multiple error cases.
Merge remote-tracking branch 'origin/master'