Fixes specs to match improvements.