Let tests use the new builder