more fallout; fix test?