Java Tests refactoring


Java Tests refactoring