Debugged test cases from last commit.