Fix test/data branching SNAFU.