Update and correction of test cases.