Fixes for broken tests