Small tweaks to get APL tests running under Linux