Fixes but broken tests?