test shared lib dir in catalina properties, tidy up test names, factor out pathnames from tests