Merge branch 'separate-tests'