KIJI-554. Updated usage and added faildeadly for tests.