Small tests optimization
Updated tests
Merge pull request #163 from AntonShevchuk/master

Small tests optimization