Fixed: broken tests