Fix test-errors
Reduce checkstyle-warnings