Fixes broken unit tests