Hopefully fixes broken tests