Minor changes to improve tests and logging during those tests.
Focus to fix test for Rescue command.