Suggestions for PR I

- Comments fixed
- test-scope added for Junit and hamcrest
- File Header added when missing
- author removed
- tests updated as suggested
- comment line-break hopefully fixed