Merge branch 'tests-init'