tests: Fix two bugs in tests revealed by new remote changes