Corrections to fix test cases.