Fixed some tests, docblocks and code style
Fix test