Modified test code to add in exceptions
Added in callStack backing up/restoring