Updated test cases to reflect changes by the last commit.