Scenario 5 tests complete.
Utilizing temporary file to use diff for verification, should
use this for other scenarios as well
Added the file as requested.
Improved the verification of scenario 2 to utilize tmp files instead
Added tests for scenario 6 - amending the commit
Added scenario_7 and tests for it
Corrected a bug, now scenario_7 passes
Refactoring tests - breaking out common part