Improved output message.
Added integration test.
Initial recoverable unit test.