...and fix the associated test