Merge pull request #28 from yagince/test-refactorring

Test refactorring