probably this will work, some JUnit tests will come within few next commits