Rework a couple more be_within specs.