Add more initialization code needed to ensure tests (again) pass