Fixes broken tests