Add more logging output, correct branch of client 'ZA' in test; relates to #266