Fixed test cases still a few issues