Final fixes for broken tests