Fixed test cases for 1e2f84a663e250a7e1d677416c393f021bb1efd7