2c6316be46
Reshuffling the tests to make the investigator the outmost rule and run the code that throws the original exception inside the investigator. Change-Id: I714717a9b616862db5ce59116138ba7ea6ceb971