- Fixed Unit test
- Target Java 1.5