Other changes:
* Fix trailing slashes for JAVA_HOME tests