Fix for broken tests