Merge "TEST: Fix Broken Java unit tests"