Switch to Nadav's Machine. All active tests passing.