Fix failing tests (#459)