Fixed test cases for v0.10.X