Mike: added screenshot grabbing on scenario failure
Mike: last revertable commit