Only op command spy and changing methods to static