Port over a623d3 to the new tests.