Fixed test case bugs and removed unstable