Fixed broken tests, thanks @kastiglione.