tests: fix a few problems encountered running against external calamari instance