Fix java tests refactored

Fix java tests refactored