Use new test-helpers package