1. Update test case
2. Add internal Debug