Fixed test cases still abit buggy