Moved test code into a separate module; additional command-line option checking; updated zcall test data