Fix up the java and rdm testing Makefiles