Minor changes on test cases.