Fixed test cases, issue #825.