Fix regression with tests