Codestyle/comments + added empty test cases