Vanchi/test fixes

@zendesk/zendesk-radar Tests are still a bit wobbly, but this should help. (Also making it verbose so we can understand more about the reasons).