UnitTests: Minor adjustments to allow testing the init sequence