Fix part of broken tests
Fix another part of broken tests