Merge branch 'jn/tests'