Fix most broken tests