fixing some busted tests
Merge remote-tracking branch 'origin/upstream-rdap' into upstream-rdap
fixing some busted tests