Added run_zcall test; minor tidying up of code
Added run_zcall test; minor tidying up of code