Fix failing test
Merge branch 'master' into oja-remove-initialize