Merge branch 'nd/test-helpers'