Working on getting backup running again.
More work on unit tests.