UnitTests: Minor adjustments to allow testing the init sequence
Issue #181: Fixes cascade deletion crash
Merge remote-tracking branch 'origin/develop' into index-reconciliation