fixed checkstyle-errors
changed line delimiters to unix
test: fix failing unit test