Merge branch 'row-tests'