Fix failing tests per https://gist.github.com/jcarapet/9531009