Updated scheme to remove broken tests