Merge branch 'sr/tests'