RSpec: Combined many tests into related groups. (part 2, minor)