Fix test cases, broken by last commit.