Added support for the Crash Handler and passing the Unit Tests