More dep fixes and enough work on java test targets & sources to get both tests/java:: and tests/scala:: testing green.