Fix failing tests. ##319