Fixes broken tests
All original tests passing