Fix failing tests. :\