(WIP) Updating EX-60 & test failure handling

@cdodge kindly review the changes.