Commit test case fixes for last commit