Merge pull request #157 from AntonShevchuk/master

Updated tests structure