Improvements related to using --keep-data option with unit tests.