Fix missing tests and coding style
Merge pull request #55 from tOkeshu/fix-refacto-calls

Fix missing tests and coding style