*sz4: small fixes, unit test adjustments