Complete the test rewrite.