Fix broken tests and fixture file