Fix some problems in os_unix.c when compiled with ENABLE_LOCKING_STYLE on OSX. Also some minor issues with test scripts.

FossilOrigin-Name: 8088031bc949bd4efb5edf33bbd1bce5700fca56