Fix to missing include, do block, move to rspec, and comments