Merge branch 'nd/combined-test-helper'