rspec description fixes and reordering