Move lets to just before they are needed
Make RSpec output more readable