Merge pull request #309 from rostafiychuk/master

Clean up and refactoring in @BeforeClass methods