fixes for broken tests