Merge branch 'jc/test-portability'