Finished a lot of incident Handling, follows tests
Minor fixes to the Incident Handling. Development for Incident Handling is over