Fixes broken tests introduced in 879a566