Remove java test, merge reload/force-reload functionality