Review Round-2 fixed failed tests