Merge branch 'jl/fix-test'