Improved test and logging.
Still working towards the unit test for rescue command.