Bugs fixed about TDD