- Fixed (1)-splitting unit tests
- Removed some PMD warnings