Tests refactor
Merge pull request #46 from Nozdi/Test_refactor

Tests refactor