Updated unit test cases to let it pass.