Addressed code review comments in test cases.