Fixed init test issues