- Modify test data & test code to fix JUnit test
- Clean code